Refactured some code. Removed some methods that are unneccessary.