cleaned up lazy mistakes