simplify the code to make it nicer for look