STYLE: bubled more stuff and made indent buble class