Fix formatting and added one other feature