Handle if-else-end
Fix issue with handling whitespace