Changed formatting and added more defaults