more testing + some code cleaning