Cleaning up based on review comments