Cleaned up visual arrangement of code
Removed labels in preparation for HTML element