refactored: prefix formatting
deleted: old prefixed stuff