Code cleanup through drupalcs