Code cleanup and fix gulp task.