Changed a few canvas styles
Refactored names based on peer review and requirements discussion