Finish restructuring less like java