Refactoring and renaming. Stripefiyng