Clean up for my needs