Make it simpler
Fix warnings