Some more code simplifying. Merged the two classes handing code reloading