Cleaning up and small updates