Updated Code

Small few class updates to standerize code