Trim

Code cleanup for release