1.0.4 commit. Cleaned some code and organized some utils into a
CoreUtils class