First pass clean ups

Just some linting, image optimising and simple code cleanups.