Cleaning coding

Cleaned code:
Removed commented out code
Formatted ListView for clarity