Prettified output and added small things to meet the assignment demands