re organized little bit