Cleanup
Refactored for closure
Layout updated