Cleaning up initialize logic