Started clean up. Created new files for utilities