Clean code and improve support for absolute references