Code formatting and correct OR-Mapping