Minor clean ups
Starting work on sprite