post-styling

Post styling and general changes