Cleaned up commented sections