Did some code cleaning and made private method for some action methods