Cleaned up for CodeKit