Removed commented code, improved metadata