Refactors and adds light styling