Small indentation fixes, pragma marks and re-arranging code.
Use NSTimeInterval instead of double, small whitespace cleanup.
merging small cleanups FREEBIE