Cleaned everything up