Cleaned up stop a bit