(clean) Begin to clean up code