Recator. Cleanup code.