(Sneha / Mike) following ruby style guidelines
removed wrong context
outdenting private methods.