Remove some variables, rename options
Clean up the mess
Implement and improve some functions
Reword