Fixed it up a bit any more suggestions