Slight reorganization, crontab-aware