CleanUp
Added properties