just removed some braces to slim down the ugly code