cleaning up naming