Working on style guide compliance