removed rspec
added comments
refactored modules