Code Cleanup + Spinning images!