Made code more readable, hopefully. Fixed the clean options