went through all changes and cleaned up