little cleanup crap
removed the last of the obviously-bar-related complexity, on to the meaty stuff!