some copypaste and codestyle cleaning