Coding cleaning up