Fix formatting and use 4 space indent