Cleaned up things