Solved 2 more codeeval challenges