some minimal changes for better PSR