code cleanup, test btn