Polishing up code started