Optimization and code clean up. Time to refactor Block Manager