Code cleanup and moving styles to .scss