Refactoring

Move draw code to sprite