Remove unnecessary styles
Refactor for better performance and wider browser support