Some stylin' improvements