Cleaned up commented out code + added more @titles