cleamed up one method