psr-1 edits, clean-up construct and add log as member var