Refactored code

tomorrow, I will start working on other pages (that eventually only the
body will be used dynamically with one page) and making “query results”
styled into a table…
Merge pull request #2 from LoganDC/master

Refactored code