Whitespace and window.* cleanup
Some devcon code cleanup for better snippetization