minor alignment and cleanup