Change type methods to be singleton methods
Move initializer above other instance methods in source
Update flay threshold