Cleaned code, worked on animation