Minor changes: removed commented code & unused local variables