cleaned up. lean and mean