Update indentation and removed if-else -jungle