v0.1.1 cleanedup