cleanup & formatting