code clean up in progress :P