Clean Up Code and fix info window