Changed formatting; removed unnecessary overloads