1058 Commits (code-cleanups)