Simplified code.
Style fixes.