cleaned up few things