Fixing based on comments

Nice! This chaining of functions is concise and clear.