Lint added
Little bit more work on lighting
Replace Math package with math
Code tidying
Code tidying