Remove time (unnecessary) and add padding for code