code cleaning just for testing Git merge