added missing indexes
removed empty helpers
replaced instance variables
cleaned up minor things with RBP