Minor: Code cleanup