Cleaner names
Reduce parameters