Simpler Find Source Method

Allows Find Source Method to be expanded more easily. Makes code neater.