Clean code. Ready to be merged in master.