Added option for L1 or L2 weight decay
Cleaned up by removing commented-out code