Better styling for elements
code cleanup and comment