- Moved Version & static strings to 'Constants' class - Cleaned out unused code that is not being used