refactored style code, now it's pretty