Followed previous coding style and lots of clean code things exist like you stated, maybe these are subject of a different PR.