- Some unnecessary comments removed