Remove commented out code, reformatting