Second commit, improved comments