[~TASK] Adjust improved error messages, fix coding standards