cleaned up server a tad to not access so much