Commented and revamped