Code cleanup
Bug everywhere.