Small fix
Final cleanup