fucking cleaned up