Cleaning up properties, moving declarations to implementation.