Cleanup

first thing - cleanup to re-familiarize myself with stuff