Fixed minor issues, removed unwanted code and added some basic rspecs