Style guidelines cleanup