11 Commits (code-cleanups)