correct formatting and cleaner