Cleaned up code format
Added functions for the client schema (get & check)