ShammyLevva code tidyup