Fixed minor standard violations/style constraints