Cleanup  and variable naming