Cleaned up coding standards and removed debug statements.