Modifications to simplify code and extract reusable methods. Start drawing hacks.