Fixed some warning regarding indentation and incomplete pattern matches