Simplifies some methods and extracts public serve middleware into function

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>