Cleanup comment / code