This should make it neat for now.