dry split buttons
comments and cleanup