Code clean up

Wrapping up