Fixed rules compliance issues, removed multiple exception classes