Structual changes and cleanup, no new features