cleaned up alot