Moved logging functionality into new static class