cleaned unnecessary stuff, rearranged sections