Remove logging
Apply small reorganizations