Small clean up
Added properties
Just coding
Just coding