cleanup & readability fixes