Made collection properties readonly

Made collection properties readonly and cleaned up usings