Adjustments to better follow coding conventions