Revert "seperate codes"

This reverts commit eae82825f77d48c2c21fb0ee86e080e67122cd80.