Cleanup code for lint task, fix rake task