attempt at better organization