Cleaning and renaming as per @frankiesardo review