Clean code (remove useless params, use blocks as much as possible)