Updated default styles
Removed some redundant code