More weeding, switching to journal style