removed some sloppy code