Renamed some methods to better match convention.
Bug fixes: eliminated redundant method, fixed bad isset check.