Added new methods, code formatting