Added missing comments and cleaned up statements