Cleaned up method usage, reduced noise