removed a little excess code