Moved some options to the cleaner main class