removed comments and refactored layout