Code clean up

(Organized methods)