Added PlaceholderLevel and some cleanup

Added PlaceholderLevel and some cleanup