Code cleanup. Everything is in its right place.