Renamed two functions and aligned values nicely