Code beautification and only 1 failing test remains