Cleaned up methods, got rid of most while loops, used created my_each