Made categories safer, removed unnecessary methods