Cleaning up design dev a little bit