Aesthetic & Editing needs

   @Nays28