Refactored some code... just testing stuff