Clean code, improve compilation speed