Clean lots of code, but have weird bug now
Fix bug and clean code