Cleaned up my configurations a bit.