styled + cleaned up