Made code formatting of new methods more consistent