Commit: Code cleanup changes