Refactoring
Removed styling