Added function descriptions, removed commented code