Solving bad pratices