Streamline some source a bit