Code cleaning up