Reformating + less ugly code