Bar Finished

I tried to get rid of as much "code smell" as possible.