Cleaned up some things and did a minor code refactor