Simplifications & further commenting