Cleaning up & starting with property checker