Added available and further cleanups