refactored methods
Merge branch 'master' of https://github.com/danehale0612/CalProject