cleaned up setup