Various minor code fixes

File renaming that didn't reach the solution file, code style change and a minor code improvement.