removed old comments and added assertions (as comments)