More cleanup and added my name