- Code clean up