updates and clean alot out
big style update