Style changes

Big changes