cleanup and code consistency