renaming and cleanup.. added the @injectable annotation