Still Implementing binary serialization
some code cleanup