Changed some literal strings to constants + other cleanup. Removed/shortened some unnecessary comments.