Removed headers and made the properties static