Gradually fixing styles and objectifying code

objectifying in the good way