style and consistency fixes