fix indentation
add has_many/has_one/belongs_to relation defs
refactor