Minor changes -- Fixed all warnings by adding explicit signatures and pattern matches