removing-elif-part1

defined the needed parameters into integers at the beginning
-This removes the need for elif statements
removing-elif-part2

All the elif statements are gone - hooray!
Merge pull request #2 from Samji/removing-elif

Removing elif