Trimming the code down to what I need