Moved styling to module and updated commenting