spotlessly working version, before spring implementation