small changes & cleaned up