Refactor of properties

Less code, and no functionality at all for now.