Cleanup

Short is better