removed placeholders where not necessary to have them