Fixed null check in conditional statement.
Cleaned up coding standards.