Cleaned up the code, i.e. removed commented code