Started implementing Serializable; Cleanup