Second iteration: Clean up, preparations for further implementation