cleaned up bloated code