[2.1.1] Small style changes and some cleanup