Clean up and micro utilities added