cleanups base on suggestion by resharper