Cleaned up commented things