Minor changes making it more beautiful