Removed line breaks and added else clause