Cleaned up loading modules