Cleaned up the LJ system