cleaned up setup formatting