cleaning up few things based on testing results