Cleanup of whitespace & commented code