Added more specifiers and cleaned things up