fixed formatting, removed commented-out code for clarity