Refactoring and removing trailing whitespaces
Changing instance variables to local variables and moving model logic to models
Merge branch 'refactor' of https://github.com/gbrego/SRA into refactor