Refactored some function names and comments
Added problem 15