Finished polishing up code