Fix properties + clean up