code cleanup
added model picking