General clean up & break Block Implementation WIP