Cleans up code

Cleans up code