Solved #18
Solved #67
Made the code for #18 and #67 more idiomatic