Clean up code style + Some work on the lighting