Assignment Completed

On to code clean up