reformat code and cleanup (no-op)