Refactoring Step 1
Refactoring Stage 2
Fixed Annotation back bug
Merge pull request #89 from CMPUT301F13T05/refactoring

Refactoring