Cleaned up setup