cleaned up shiz