Refactored, cleaned up some unnecessary lines of code, and fixed a
couple spacing issues and bulleting issues