Add some clarifications and simplfy some code