Small improvements + code style fixes