Removed stray code
Moved code around for readability
Moved code around for readability