Cleaned from extra comments