Refactored and Made Dynamic

Refactored some code to utilize class methods and made some lists more
dynamic.