Cleaned up the code for readability, added neural_network to setup