Beautified
Updates to options, remove unused files