Worst Practices Commit

Fixed the ugly mess!