Cleaned up project and edited code for simplicity