Cleaned up and simplified variables placeholdering.