style improvements, separation