Moving around onLoad Function, doing a bit of whitespace cleanup