Removed Window alerts. Formatting changes. Added some TODOs