Refactoring exercise class
Cleaned up Exercise class