Basic item subtype parsing implemented.
Code convention cleanup.