Clean up code and variable names