Modified argument type, along with some aesthetic changes