removed push/pop style