Added cleaned up setup