Adjust to my new coding style