cleanup up and did some organization