Changed formatting and small fixes