[Not Tested] Syriven's files. Beautified them.

Have not tested these.