Fixed various small style bugs