Cleaning up code and adding more styles