Style improvements + bug fix