Removed what seems to be an unncessary contextual filter

code formatting
code cleanup