Added methods, cleanup