deprecation & spacing fix