Clean and organized

/Clean and organized