resolved code issues (resharper)