Little Cleanup/reorganization