Style consistency fixes