Cleaned up even more