Code beautifyed, Tests passed