Code formatting + clean up