CHANGED: Code Quality - Fixed minor code issues.