Cleaned Factory stuff