Use setters to centralize logic and ternary for one line statements.
Improve jd formating