Code Cleanup

Removed empty html tags, move action functions to single line, changed
spacing for better readability.