Bump up to snapshots
Code clean up