Style improvements and key checking simplification
Further style improvements