Cleaned up code + drawing quite a bit