Cleaned up my previous code-clutter