Cleaning up setup code