Ring Buffer
General tidy up