Rearranged properties and improved comments